Return FALSE not true in the grab_widget == NULL case. (Bug reported by

Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
	in the grab_widget == NULL case. (Bug reported by
	Padraig O'Briain, #69735)

	* gtk/gtkplug.c (handle_modality_on): Realize the modality
	window so gtk_widget_event() doesn't complain :-((((.

diff --git a/ChangeLog b/ChangeLog
index 0609e6a610b6a9af8a5871c7f0588580d05b99ea..17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+       in the grab_widget == NULL case. (Bug reported by 
+       Padraig O'Briain, #69735)
+
+       * gtk/gtkplug.c (handle_modality_on): Realize the modality
+       window so gtk_widget_event() doesn't complain :-((((.
+
 2002-01-25  Federico Mena Quintero  <federico@ximian.com>
 
        Merge from gdk-pixbuf stable.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0609e6a610b6a9af8a5871c7f0588580d05b99ea..17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+       in the grab_widget == NULL case. (Bug reported by 
+       Padraig O'Briain, #69735)
+
+       * gtk/gtkplug.c (handle_modality_on): Realize the modality
+       window so gtk_widget_event() doesn't complain :-((((.
+
 2002-01-25  Federico Mena Quintero  <federico@ximian.com>
 
        Merge from gdk-pixbuf stable.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0609e6a610b6a9af8a5871c7f0588580d05b99ea..17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+       in the grab_widget == NULL case. (Bug reported by 
+       Padraig O'Briain, #69735)
+
+       * gtk/gtkplug.c (handle_modality_on): Realize the modality
+       window so gtk_widget_event() doesn't complain :-((((.
+
 2002-01-25  Federico Mena Quintero  <federico@ximian.com>
 
        Merge from gdk-pixbuf stable.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0609e6a610b6a9af8a5871c7f0588580d05b99ea..17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+       in the grab_widget == NULL case. (Bug reported by 
+       Padraig O'Briain, #69735)
+
+       * gtk/gtkplug.c (handle_modality_on): Realize the modality
+       window so gtk_widget_event() doesn't complain :-((((.
+
 2002-01-25  Federico Mena Quintero  <federico@ximian.com>
 
        Merge from gdk-pixbuf stable.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0609e6a610b6a9af8a5871c7f0588580d05b99ea..17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+       in the grab_widget == NULL case. (Bug reported by 
+       Padraig O'Briain, #69735)
+
+       * gtk/gtkplug.c (handle_modality_on): Realize the modality
+       window so gtk_widget_event() doesn't complain :-((((.
+
 2002-01-25  Federico Mena Quintero  <federico@ximian.com>
 
        Merge from gdk-pixbuf stable.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0609e6a610b6a9af8a5871c7f0588580d05b99ea..17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+       in the grab_widget == NULL case. (Bug reported by 
+       Padraig O'Briain, #69735)
+
+       * gtk/gtkplug.c (handle_modality_on): Realize the modality
+       window so gtk_widget_event() doesn't complain :-((((.
+
 2002-01-25  Federico Mena Quintero  <federico@ximian.com>
 
        Merge from gdk-pixbuf stable.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0609e6a610b6a9af8a5871c7f0588580d05b99ea..17f95cac07a8a796b70b8bf5c59a6ca0a5b3eb76 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Sat Jan 26 19:04:37 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true
+       in the grab_widget == NULL case. (Bug reported by 
+       Padraig O'Briain, #69735)
+
+       * gtk/gtkplug.c (handle_modality_on): Realize the modality
+       window so gtk_widget_event() doesn't complain :-((((.
+
 2002-01-25  Federico Mena Quintero  <federico@ximian.com>
 
        Merge from gdk-pixbuf stable.

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b178bd929e2fef4bb47bc695ec8157ded50cfca9..a9c0dae3c2486ad3d6fef24ece27a1db72e6cb8c 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1169,7 +1169,7 @@ check_is_grabbed (GtkWidget *widget,
   if (grab_widget)
     return !(widget == grab_widget || gtk_widget_is_ancestor (widget, grab_widget));
   else
-    return TRUE;
+    return FALSE;
 }
 
 static void

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 74b4f2a12ecdb2a0a08bfaa14b4c5c8004685081..aff46e861b86cd24cb05d31a06e88eb7c1678233 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -916,6 +916,7 @@ handle_modality_on (GtkPlug *plug)
   if (!plug->modality_window)
     {
       plug->modality_window = gtk_window_new (GTK_WINDOW_POPUP);
+      gtk_widget_realize (plug->modality_window);
       gtk_window_group_add_window (plug->modality_group, GTK_WINDOW (plug->modality_window));
       gtk_grab_add (plug->modality_window);
     }